128. Araxis Merge File Comparison Report

Produced by Araxis Merge on 2021-07-21 10:22:01 +0000. See www.araxis.com for information about Merge. This report uses XHTML and CSS2, and is best viewed with a modern standards-compliant browser. For optimum results when printing this report, use landscape orientation and enable printing of background images and colours in your browser.

128.1 Files compared

#	Location	File	Last Modified
1			2021-07-21 10:22:01 +0000
2	/Applications/Ampps/www/Porto v4.0.1/Theme Files/Magento 2.x/Porto Theme/app/design/frontend/Smartwave/porto/Smartwave_Porto/templates	custom_block.phtml	2021-06-12 08:01:12 +0000

128.2 Comparison summary

Description	Between Files 1 and 2
Description	Text Blocks	Lines
Unchanged	0	0
Changed	0	0
Inserted	1	30
Removed	0	0

128.3 Comparison options

Whitespace	Consecutive whitespace is treated as a single space
Character case	Differences in character case are significant
Line endings	Differences in line endings (`CR` and `LF` characters) are ignored
CR/LF characters	Not shown in the comparison detail
Active line-pairing rules

128.4 Active regular expressions

No regular expressions were active.

128.5 Comparison detail

				1		<?php
				2		$sidebar_sticky = $this->getConfig('porto_settings/general/sidebar_sticky');
				3		$block_view = $this->getConfig('porto_settings/general');
				4		$block = $this->getLayout()->createBlock('Magento\Cms\Block\Block');
				5		if($block) {
				6		$block->setBlockId($block_view['sidebar_second_block']);
				7		}
				8		if($block){ ?>
				9		<div class="side-custom-block">
				10		<?php echo $block->toHtml(); ?>
				11		</div>
				12		<?php if($sidebar_sticky): ?>
				13		<script type="text/javascript">
				14		require([
				15		'jquery',
				16		'themeSticky'
				17		], function ($) {
				18		$(".sidebar.sidebar-second .side-custom-block").themeSticky({
				19		autoInit: true,
				20		minWidth: 992,
				21		containerSelector: '.page-main .columns',
				22		autoFit: true,
				23		paddingOffsetBottom: 10,
				24		paddingOffsetTop: 60
				25		});
				26		});
				27		</script>
				28		<?php endif; ?>
				29		<?php }
				30		?>